Support old-style message contexts, too.

2007-07-08  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtkbuilderparser.c (pgettext): Support old-style
        message contexts, too.

svn path=/trunk/; revision=18405

diff --git a/ChangeLog b/ChangeLog
index 7399d16ff8d5748d0b761c0a33b59ee669bd917a..cc66a6bb8b19fffb3057caef874d33fb61760221 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-08  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkbuilderparser.c (pgettext): Support old-style
+       message contexts, too. 
+
 2007-07-08  Johan Dahlin  <jdahlin@async.com.br>
 
        * gtk/gtk-builder-convert: Improve the way properties

diff --git a/gtk/gtkbuilderparser.c b/gtk/gtkbuilderparser.c
index b4700b1f0eb203d7a6445ad50e3ca4adb513cbdc..8937b7847a7d8c24d1848d9599b31b68bbc51e94 100644 (file)
--- a/gtk/gtkbuilderparser.c
+++ b/gtk/gtkbuilderparser.c
@@ -865,10 +865,17 @@ dpgettext (const char *domain,
 
   translation = dgettext (domain, msg_ctxt_id);
 
-  if (translation != msg_ctxt_id) 
-    return translation;
+  if (translation == msg_ctxt_id) 
+    {
+      /* try the old way of doing message contexts, too */
+      msg_ctxt_id[msgctxt_len - 1] = '|';
+      translation = dgettext (domain, msg_ctxt_id);
+  
+      if (translation == msg_ctxt_id)
+        return msgid;
+    }
  
-  return msgid;
+  return translation;
 }
 
 /* Called for character data */